Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Tue, 6 Apr 2010 20:57:22 +0000 (22:57 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 6 Apr 2010 20:57:22 +0000 (22:57 +0200)

Trivial merge